From 5d1be09b32e32260dfb7bb5534ce36e2155a9e0c Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Tue, 7 Dec 2004 19:17:22 +0000 Subject: [PATCH] bitkeeper revision 1.1159.170.61 (41b601c2hqYXs_GyXCoioNz7m4Q_Cg) mem.c: cleanup after sync. balloon.h: Rename: linux-2.6.9-xen-sparse/include/asm-xen/balloon.h -> linux-2.6.10-rc2-xen-sparse/include/asm-xen/balloon.h devmem.c: Rename: linux-2.6.9-xen-sparse/arch/xen/kernel/devmem.c -> linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/devmem.c --- .rootkeys | 4 ++-- .../arch/xen/kernel/devmem.c | 0 linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c | 17 ++++++----------- .../include/asm-xen/balloon.h | 0 4 files changed, 8 insertions(+), 13 deletions(-) rename {linux-2.6.9-xen-sparse => linux-2.6.10-rc2-xen-sparse}/arch/xen/kernel/devmem.c (100%) rename {linux-2.6.9-xen-sparse => linux-2.6.10-rc2-xen-sparse}/include/asm-xen/balloon.h (100%) diff --git a/.rootkeys b/.rootkeys index e6307ea48c..932dc5ec9d 100644 --- a/.rootkeys +++ b/.rootkeys @@ -169,6 +169,7 @@ 4107adf1s5u6249DNPUViX1YNagbUQ linux-2.6.10-rc2-xen-sparse/arch/xen/i386/pci/irq.c 40f56239zOksGg_H4XD4ye6iZNtoZA linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/Makefile 40f56239bvOjuuuViZ0XMlNiREFC0A linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/ctrl_if.c +41ab6fa06JdF7jxUsuDcjN3UhuIAxg linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/devmem.c 40f56238xFQe9T7M_U_FItM-bZIpLw linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/evtchn.c 4110f478aeQWllIN7J4kouAHiAqrPw linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/fixup.c 412dfae9eA3_6e6bCGUtg1mj8b56fQ linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/gnttab.c @@ -234,6 +235,7 @@ 40f5623bc8LKPRO09wY5dGDnY_YCpw linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/tlbflush.h 41062ab7uFxnCq-KtPeAm-aV8CicgA linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/vga.h 40f5623bxUbeGjkRrjDguCy_Gm8RLw linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/xor.h +41af4017PDMuSmMWtSRU5UC9Vylw5g linux-2.6.10-rc2-xen-sparse/include/asm-xen/balloon.h 40f5623bYNP7tHE2zX6YQxp9Zq2utQ linux-2.6.10-rc2-xen-sparse/include/asm-xen/ctrl_if.h 40f5623b3Eqs8pAc5WpPX8_jTzV2qw linux-2.6.10-rc2-xen-sparse/include/asm-xen/evtchn.h 419b4e9367PjTEvdjwavWN12BeBBXg linux-2.6.10-rc2-xen-sparse/include/asm-xen/foreign_page.h @@ -253,8 +255,6 @@ 410a94a4KT6I6X0LVc7djB39tRDp4g linux-2.6.10-rc2-xen-sparse/mm/page_alloc.c 41505c572m-s9ATiO1LiD1GPznTTIg linux-2.6.10-rc2-xen-sparse/net/core/skbuff.c 4149ec79wMpIHdvbntxqVGLRZZjPxw linux-2.6.10-rc2-xen-sparse/net/ipv4/raw.c -41ab6fa06JdF7jxUsuDcjN3UhuIAxg linux-2.6.9-xen-sparse/arch/xen/kernel/devmem.c -41af4017PDMuSmMWtSRU5UC9Vylw5g linux-2.6.9-xen-sparse/include/asm-xen/balloon.h 413cb1e4zst25MDYjg63Y-NGC5_pLg netbsd-2.0-xen-sparse/Makefile 413cb1e5c_Mkxf_X0zimEhTKI_l4DA netbsd-2.0-xen-sparse/mkbuildtree 413cb1e5kY_Zil7-b0kI6hvCIxBEYg netbsd-2.0-xen-sparse/nbconfig-xen diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/devmem.c b/linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/devmem.c similarity index 100% rename from linux-2.6.9-xen-sparse/arch/xen/kernel/devmem.c rename to linux-2.6.10-rc2-xen-sparse/arch/xen/kernel/devmem.c diff --git a/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c b/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c index 35efc7799f..8eae836f01 100644 --- a/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c +++ b/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c @@ -202,17 +202,12 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma) vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); #endif - /* Don't try to swap out physical pages.. */ - vma->vm_flags |= VM_RESERVED; - - /* - * Don't dump addresses that are not real memory to a core file. - */ - if (uncached) - vma->vm_flags |= VM_IO; - - if (remap_page_range(vma, vma->vm_start, offset, vma->vm_end-vma->vm_start, - vma->vm_page_prot)) + /* Remap-pfn-range will mark the range VM_IO and VM_RESERVED */ + if (remap_pfn_range(vma, + vma->vm_start, + vma->vm_pgoff, + vma->vm_end-vma->vm_start, + vma->vm_page_prot)) return -EAGAIN; return 0; } diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/balloon.h b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/balloon.h similarity index 100% rename from linux-2.6.9-xen-sparse/include/asm-xen/balloon.h rename to linux-2.6.10-rc2-xen-sparse/include/asm-xen/balloon.h -- 2.30.2